Procházet zdrojové kódy

修改分页插件依赖,由于依赖的问题分页插件依赖失效

před 5 roky
rodič
revize
eba54e104b

+ 15 - 0
cloud-model/src/main/java/com/hssx/cloudmodel/controller/MouldEquipmentController.java

@@ -2,6 +2,7 @@ package com.hssx.cloudmodel.controller;
 
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.hssx.cloudmodel.entity.ChangeIpCommand;
 import com.hssx.cloudmodel.entity.MouldEquipment;
 import com.hssx.cloudmodel.entity.SensorThreshold;
 import com.hssx.cloudmodel.entity.User;
@@ -91,6 +92,20 @@ public class MouldEquipmentController {
         return msg;
     }
 
+    /**
+     * 切换ip
+     * ip 要切换的ip,如:58.213.104.114
+     * port 端口,如:2019
+     */
+    @ApiOperation("切换ip")
+    @RequestMapping("/changeIp")
+    @ResponseBody
+    public HttpRespMsg changeIp(ChangeIpCommand changeIpCommand) {
+        HttpRespMsg msg = new HttpRespMsg();
+        msg = mouldEquipmentService.changeIp(changeIpCommand);
+        return msg;
+    }
+
     /**
      * 创建模具时获取资产方公司的设备列表
      * 参数 belongCompanyId 当前登录人公司id,

+ 108 - 0
cloud-model/src/main/java/com/hssx/cloudmodel/entity/ChangeIpCommand.java

@@ -0,0 +1,108 @@
+package com.hssx.cloudmodel.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.extension.activerecord.Model;
+import com.baomidou.mybatisplus.annotation.TableId;
+import java.time.LocalDateTime;
+import com.baomidou.mybatisplus.annotation.TableField;
+import java.io.Serializable;
+
+/**
+ * <p>
+ * 
+ * </p>
+ *
+ * @author 吴涛涛
+ * @since 2019-10-31
+ */
+public class ChangeIpCommand extends Model<ChangeIpCommand> {
+
+    private static final long serialVersionUID=1L;
+
+    /**
+     * 下发切换ip表主键
+     */
+    @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
+
+    /**
+     * ip
+     */
+    @TableField("ip")
+    private String ip;
+
+    /**
+     * 端口
+     */
+    @TableField("port")
+    private String port;
+
+    /**
+     * 时间
+     */
+    @TableField("indate")
+    private LocalDateTime indate;
+
+    /**
+     * 是否已下发0-未下发,1-已下发
+     */
+    @TableField("is_send")
+    private Integer isSend;
+
+
+    public Integer getId() {
+        return id;
+    }
+
+    public void setId(Integer id) {
+        this.id = id;
+    }
+
+    public String getIp() {
+        return ip;
+    }
+
+    public void setIp(String ip) {
+        this.ip = ip;
+    }
+
+    public String getPort() {
+        return port;
+    }
+
+    public void setPort(String port) {
+        this.port = port;
+    }
+
+    public LocalDateTime getIndate() {
+        return indate;
+    }
+
+    public void setIndate(LocalDateTime indate) {
+        this.indate = indate;
+    }
+
+    public Integer getIsSend() {
+        return isSend;
+    }
+
+    public void setIsSend(Integer isSend) {
+        this.isSend = isSend;
+    }
+
+    @Override
+    protected Serializable pkVal() {
+        return this.id;
+    }
+
+    @Override
+    public String toString() {
+        return "ChangeIpCommand{" +
+        "id=" + id +
+        ", ip=" + ip +
+        ", port=" + port +
+        ", indate=" + indate +
+        ", isSend=" + isSend +
+        "}";
+    }
+}

+ 16 - 0
cloud-model/src/main/java/com/hssx/cloudmodel/mapper/ChangeIpCommandMapper.java

@@ -0,0 +1,16 @@
+package com.hssx.cloudmodel.mapper;
+
+import com.hssx.cloudmodel.entity.ChangeIpCommand;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author 吴涛涛
+ * @since 2019-10-31
+ */
+public interface ChangeIpCommandMapper extends BaseMapper<ChangeIpCommand> {
+
+}

+ 16 - 0
cloud-model/src/main/java/com/hssx/cloudmodel/service/ChangeIpCommandService.java

@@ -0,0 +1,16 @@
+package com.hssx.cloudmodel.service;
+
+import com.hssx.cloudmodel.entity.ChangeIpCommand;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ *  服务类
+ * </p>
+ *
+ * @author 吴涛涛
+ * @since 2019-10-31
+ */
+public interface ChangeIpCommandService extends IService<ChangeIpCommand> {
+
+}

+ 2 - 0
cloud-model/src/main/java/com/hssx/cloudmodel/service/MouldEquipmentService.java

@@ -1,5 +1,6 @@
 package com.hssx.cloudmodel.service;
 
+import com.hssx.cloudmodel.entity.ChangeIpCommand;
 import com.hssx.cloudmodel.entity.MouldEquipment;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.hssx.cloudmodel.entity.SensorThreshold;
@@ -34,4 +35,5 @@ public interface MouldEquipmentService extends IService<MouldEquipment> {
 
     HttpRespMsg getEquipmentListByOldMouldAndUser(UserVO userVO);
 
+    HttpRespMsg changeIp(ChangeIpCommand changeIpCommand);
 }

+ 20 - 0
cloud-model/src/main/java/com/hssx/cloudmodel/service/impl/ChangeIpCommandServiceImpl.java

@@ -0,0 +1,20 @@
+package com.hssx.cloudmodel.service.impl;
+
+import com.hssx.cloudmodel.entity.ChangeIpCommand;
+import com.hssx.cloudmodel.mapper.ChangeIpCommandMapper;
+import com.hssx.cloudmodel.service.ChangeIpCommandService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ *  服务实现类
+ * </p>
+ *
+ * @author 吴涛涛
+ * @since 2019-10-31
+ */
+@Service
+public class ChangeIpCommandServiceImpl extends ServiceImpl<ChangeIpCommandMapper, ChangeIpCommand> implements ChangeIpCommandService {
+
+}

+ 8 - 1
cloud-model/src/main/java/com/hssx/cloudmodel/service/impl/MouldEquipmentServiceImpl.java

@@ -65,7 +65,7 @@ public class MouldEquipmentServiceImpl extends ServiceImpl<MouldEquipmentMapper,
     @Resource
     ProjectUserMapper projectUserMapper;
     @Resource
-    SensorThresholdMapper sensorThresholdMapper;
+    ChangeIpCommandMapper changeIpCommandMapper;
 
     @Override
     public HttpRespMsg addAndUpdateMouldEquipment(MouldEquipment mouldEquipment, User user) {
@@ -434,6 +434,13 @@ public class MouldEquipmentServiceImpl extends ServiceImpl<MouldEquipmentMapper,
         return msg;
     }
 
+    @Override
+    public HttpRespMsg changeIp(ChangeIpCommand changeIpCommand) {
+        HttpRespMsg msg = new HttpRespMsg();
+        changeIpCommandMapper.insert(changeIpCommand);
+        return msg;
+    }
+
     /**
      * 输入流转file
      *

+ 1 - 1
cloud-model/src/main/java/com/hssx/cloudmodel/util/CodeGenerator.java

@@ -204,7 +204,7 @@ public class CodeGenerator {
         //若想要生成的实体类继承某个Controller,则可打开下面注释。写上需要继承的Controller的位置即可
 //        strategy.setSuperControllerClass("com.baomidou.ant.common.BaseController");
         //此处user是表名,多个英文逗号分割
-        strategy.setInclude("packet_loss_record");
+        strategy.setInclude("change_ip_command");
 //        strategy.setExclude();//数据库表全生成
 //        strategy.setInclude(scanner("user").split(","));//表名,多个英文逗号分割
         strategy.setControllerMappingHyphenStyle(true);

+ 19 - 0
cloud-model/src/main/resources/mapper/ChangeIpCommandMapper.xml

@@ -0,0 +1,19 @@
+<?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.hssx.cloudmodel.mapper.ChangeIpCommandMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.hssx.cloudmodel.entity.ChangeIpCommand">
+        <id column="id" property="id" />
+        <result column="ip" property="ip" />
+        <result column="port" property="port" />
+        <result column="indate" property="indate" />
+        <result column="is_send" property="isSend" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        id, ip, port, indate, is_send
+    </sql>
+
+</mapper>