基本信息报新增

xymanager_admin/src/main/java/com/shxy/xymanager_admin/controller/TerminalController.java

@@ -313,31 +313,6 @@ public class TerminalController extends BaseController {
         }
     }
 
-    @ApiOperation(value = "获取装置总详情列表报表", notes = "获取装置总详情列表报表", httpMethod = "POST")
-    @ApiResponses({@ApiResponse(code = 200, message = "请求成功"), @ApiResponse(code = 400, message = "请求参数没填好"), @ApiResponse(code = 404, message = "请求路径没有或页面跳转路径不对")})
-    @RequestMapping("/getAllTermDetailsList")
-    @Log(title = "获取装置总详情列表报表", type = "查询")
-    public ResponseReult<ProtocolListModel> getAllTermDetailsList() {
-        ServiceBody<ProtocolListModel> serviceBody = terminalService.getAllTermDetailsList();
-        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("/getTermBasicInfoList")
-    @Log(title = "装置基本信息历史列表", type = "查询")
-    public ResponseReult<ProtocolListModel> getTermBasicInfoList(BasicTermVo vo) {
-        ServiceBody<ProtocolListModel> serviceBody = terminalService.getTermBasicInfoList(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 = "请求路径没有或页面跳转路径不对")})

xymanager_common/src/main/java/com/shxy/xymanager_common/entity/Lines.java

@@ -15,6 +15,10 @@ import java.util.List;
 @ApiModel(value = "线路", description = "线路")
 public class Lines implements Serializable {
 
+    private Integer onlinenum;
+
+    private Integer totalnum;
+
     @ApiModelProperty(value = "线路编号", example = "123456")
     private Integer id;
 

xymanager_common/src/main/java/com/shxy/xymanager_common/entity/TerminalBasicInfoHistoryExample.java

@@ -1,6 +1,8 @@
 package com.shxy.xymanager_common.entity;
 
 import java.util.ArrayList;
+import java.util.Date;
+import java.util.Iterator;
 import java.util.List;
 
 public class TerminalBasicInfoHistoryExample {
@@ -104,6 +106,32 @@ public class TerminalBasicInfoHistoryExample {
             criteria.add(new Criterion(condition, value1, value2));
         }
 
+        protected void addCriterionForJDBCDate(String condition, Date value, String property) {
+            if (value == null) {
+                throw new RuntimeException("Value for " + property + " cannot be null");
+            }
+            addCriterion(condition, new java.sql.Date(value.getTime()), property);
+        }
+
+        protected void addCriterionForJDBCDate(String condition, List<Date> values, String property) {
+            if (values == null || values.size() == 0) {
+                throw new RuntimeException("Value list for " + property + " cannot be null or empty");
+            }
+            List<java.sql.Date> dateList = new ArrayList<java.sql.Date>();
+            Iterator<Date> iter = values.iterator();
+            while (iter.hasNext()) {
+                dateList.add(new java.sql.Date(iter.next().getTime()));
+            }
+            addCriterion(condition, dateList, property);
+        }
+
+        protected void addCriterionForJDBCDate(String condition, Date value1, Date value2, String property) {
+            if (value1 == null || value2 == null) {
+                throw new RuntimeException("Between values for " + property + " cannot be null");
+            }
+            addCriterion(condition, new java.sql.Date(value1.getTime()), new java.sql.Date(value2.getTime()), property);
+        }
+
         public Criteria andTermIdIsNull() {
             addCriterion("term_id is null");
             return (Criteria) this;
@@ -433,6 +461,346 @@ public class TerminalBasicInfoHistoryExample {
             addCriterion("update_time not between", value1, value2, "updateTime");
             return (Criteria) this;
         }
+
+        public Criteria andEquipNameIsNull() {
+            addCriterion("equip_name is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andEquipNameIsNotNull() {
+            addCriterion("equip_name is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andEquipNameEqualTo(String value) {
+            addCriterion("equip_name =", value, "equipName");
+            return (Criteria) this;
+        }
+
+        public Criteria andEquipNameNotEqualTo(String value) {
+            addCriterion("equip_name <>", value, "equipName");
+            return (Criteria) this;
+        }
+
+        public Criteria andEquipNameGreaterThan(String value) {
+            addCriterion("equip_name >", value, "equipName");
+            return (Criteria) this;
+        }
+
+        public Criteria andEquipNameGreaterThanOrEqualTo(String value) {
+            addCriterion("equip_name >=", value, "equipName");
+            return (Criteria) this;
+        }
+
+        public Criteria andEquipNameLessThan(String value) {
+            addCriterion("equip_name <", value, "equipName");
+            return (Criteria) this;
+        }
+
+        public Criteria andEquipNameLessThanOrEqualTo(String value) {
+            addCriterion("equip_name <=", value, "equipName");
+            return (Criteria) this;
+        }
+
+        public Criteria andEquipNameLike(String value) {
+            addCriterion("equip_name like", value, "equipName");
+            return (Criteria) this;
+        }
+
+        public Criteria andEquipNameNotLike(String value) {
+            addCriterion("equip_name not like", value, "equipName");
+            return (Criteria) this;
+        }
+
+        public Criteria andEquipNameIn(List<String> values) {
+            addCriterion("equip_name in", values, "equipName");
+            return (Criteria) this;
+        }
+
+        public Criteria andEquipNameNotIn(List<String> values) {
+            addCriterion("equip_name not in", values, "equipName");
+            return (Criteria) this;
+        }
+
+        public Criteria andEquipNameBetween(String value1, String value2) {
+            addCriterion("equip_name between", value1, value2, "equipName");
+            return (Criteria) this;
+        }
+
+        public Criteria andEquipNameNotBetween(String value1, String value2) {
+            addCriterion("equip_name not between", value1, value2, "equipName");
+            return (Criteria) this;
+        }
+
+        public Criteria andModelIsNull() {
+            addCriterion("model is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andModelIsNotNull() {
+            addCriterion("model is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andModelEqualTo(String value) {
+            addCriterion("model =", value, "model");
+            return (Criteria) this;
+        }
+
+        public Criteria andModelNotEqualTo(String value) {
+            addCriterion("model <>", value, "model");
+            return (Criteria) this;
+        }
+
+        public Criteria andModelGreaterThan(String value) {
+            addCriterion("model >", value, "model");
+            return (Criteria) this;
+        }
+
+        public Criteria andModelGreaterThanOrEqualTo(String value) {
+            addCriterion("model >=", value, "model");
+            return (Criteria) this;
+        }
+
+        public Criteria andModelLessThan(String value) {
+            addCriterion("model <", value, "model");
+            return (Criteria) this;
+        }
+
+        public Criteria andModelLessThanOrEqualTo(String value) {
+            addCriterion("model <=", value, "model");
+            return (Criteria) this;
+        }
+
+        public Criteria andModelLike(String value) {
+            addCriterion("model like", value, "model");
+            return (Criteria) this;
+        }
+
+        public Criteria andModelNotLike(String value) {
+            addCriterion("model not like", value, "model");
+            return (Criteria) this;
+        }
+
+        public Criteria andModelIn(List<String> values) {
+            addCriterion("model in", values, "model");
+            return (Criteria) this;
+        }
+
+        public Criteria andModelNotIn(List<String> values) {
+            addCriterion("model not in", values, "model");
+            return (Criteria) this;
+        }
+
+        public Criteria andModelBetween(String value1, String value2) {
+            addCriterion("model between", value1, value2, "model");
+            return (Criteria) this;
+        }
+
+        public Criteria andModelNotBetween(String value1, String value2) {
+            addCriterion("model not between", value1, value2, "model");
+            return (Criteria) this;
+        }
+
+        public Criteria andProtocolVersionIsNull() {
+            addCriterion("protocol_version is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andProtocolVersionIsNotNull() {
+            addCriterion("protocol_version is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andProtocolVersionEqualTo(String value) {
+            addCriterion("protocol_version =", value, "protocolVersion");
+            return (Criteria) this;
+        }
+
+        public Criteria andProtocolVersionNotEqualTo(String value) {
+            addCriterion("protocol_version <>", value, "protocolVersion");
+            return (Criteria) this;
+        }
+
+        public Criteria andProtocolVersionGreaterThan(String value) {
+            addCriterion("protocol_version >", value, "protocolVersion");
+            return (Criteria) this;
+        }
+
+        public Criteria andProtocolVersionGreaterThanOrEqualTo(String value) {
+            addCriterion("protocol_version >=", value, "protocolVersion");
+            return (Criteria) this;
+        }
+
+        public Criteria andProtocolVersionLessThan(String value) {
+            addCriterion("protocol_version <", value, "protocolVersion");
+            return (Criteria) this;
+        }
+
+        public Criteria andProtocolVersionLessThanOrEqualTo(String value) {
+            addCriterion("protocol_version <=", value, "protocolVersion");
+            return (Criteria) this;
+        }
+
+        public Criteria andProtocolVersionLike(String value) {
+            addCriterion("protocol_version like", value, "protocolVersion");
+            return (Criteria) this;
+        }
+
+        public Criteria andProtocolVersionNotLike(String value) {
+            addCriterion("protocol_version not like", value, "protocolVersion");
+            return (Criteria) this;
+        }
+
+        public Criteria andProtocolVersionIn(List<String> values) {
+            addCriterion("protocol_version in", values, "protocolVersion");
+            return (Criteria) this;
+        }
+
+        public Criteria andProtocolVersionNotIn(List<String> values) {
+            addCriterion("protocol_version not in", values, "protocolVersion");
+            return (Criteria) this;
+        }
+
+        public Criteria andProtocolVersionBetween(String value1, String value2) {
+            addCriterion("protocol_version between", value1, value2, "protocolVersion");
+            return (Criteria) this;
+        }
+
+        public Criteria andProtocolVersionNotBetween(String value1, String value2) {
+            addCriterion("protocol_version not between", value1, value2, "protocolVersion");
+            return (Criteria) this;
+        }
+
+        public Criteria andBsManuIsNull() {
+            addCriterion("bs_manu is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andBsManuIsNotNull() {
+            addCriterion("bs_manu is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andBsManuEqualTo(String value) {
+            addCriterion("bs_manu =", value, "bsManu");
+            return (Criteria) this;
+        }
+
+        public Criteria andBsManuNotEqualTo(String value) {
+            addCriterion("bs_manu <>", value, "bsManu");
+            return (Criteria) this;
+        }
+
+        public Criteria andBsManuGreaterThan(String value) {
+            addCriterion("bs_manu >", value, "bsManu");
+            return (Criteria) this;
+        }
+
+        public Criteria andBsManuGreaterThanOrEqualTo(String value) {
+            addCriterion("bs_manu >=", value, "bsManu");
+            return (Criteria) this;
+        }
+
+        public Criteria andBsManuLessThan(String value) {
+            addCriterion("bs_manu <", value, "bsManu");
+            return (Criteria) this;
+        }
+
+        public Criteria andBsManuLessThanOrEqualTo(String value) {
+            addCriterion("bs_manu <=", value, "bsManu");
+            return (Criteria) this;
+        }
+
+        public Criteria andBsManuLike(String value) {
+            addCriterion("bs_manu like", value, "bsManu");
+            return (Criteria) this;
+        }
+
+        public Criteria andBsManuNotLike(String value) {
+            addCriterion("bs_manu not like", value, "bsManu");
+            return (Criteria) this;
+        }
+
+        public Criteria andBsManuIn(List<String> values) {
+            addCriterion("bs_manu in", values, "bsManu");
+            return (Criteria) this;
+        }
+
+        public Criteria andBsManuNotIn(List<String> values) {
+            addCriterion("bs_manu not in", values, "bsManu");
+            return (Criteria) this;
+        }
+
+        public Criteria andBsManuBetween(String value1, String value2) {
+            addCriterion("bs_manu between", value1, value2, "bsManu");
+            return (Criteria) this;
+        }
+
+        public Criteria andBsManuNotBetween(String value1, String value2) {
+            addCriterion("bs_manu not between", value1, value2, "bsManu");
+            return (Criteria) this;
+        }
+
+        public Criteria andProductionDateIsNull() {
+            addCriterion("production_date is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andProductionDateIsNotNull() {
+            addCriterion("production_date is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andProductionDateEqualTo(Date value) {
+            addCriterionForJDBCDate("production_date =", value, "productionDate");
+            return (Criteria) this;
+        }
+
+        public Criteria andProductionDateNotEqualTo(Date value) {
+            addCriterionForJDBCDate("production_date <>", value, "productionDate");
+            return (Criteria) this;
+        }
+
+        public Criteria andProductionDateGreaterThan(Date value) {
+            addCriterionForJDBCDate("production_date >", value, "productionDate");
+            return (Criteria) this;
+        }
+
+        public Criteria andProductionDateGreaterThanOrEqualTo(Date value) {
+            addCriterionForJDBCDate("production_date >=", value, "productionDate");
+            return (Criteria) this;
+        }
+
+        public Criteria andProductionDateLessThan(Date value) {
+            addCriterionForJDBCDate("production_date <", value, "productionDate");
+            return (Criteria) this;
+        }
+
+        public Criteria andProductionDateLessThanOrEqualTo(Date value) {
+            addCriterionForJDBCDate("production_date <=", value, "productionDate");
+            return (Criteria) this;
+        }
+
+        public Criteria andProductionDateIn(List<Date> values) {
+            addCriterionForJDBCDate("production_date in", values, "productionDate");
+            return (Criteria) this;
+        }
+
+        public Criteria andProductionDateNotIn(List<Date> values) {
+            addCriterionForJDBCDate("production_date not in", values, "productionDate");
+            return (Criteria) this;
+        }
+
+        public Criteria andProductionDateBetween(Date value1, Date value2) {
+            addCriterionForJDBCDate("production_date between", value1, value2, "productionDate");
+            return (Criteria) this;
+        }
+
+        public Criteria andProductionDateNotBetween(Date value1, Date value2) {
+            addCriterionForJDBCDate("production_date not between", value1, value2, "productionDate");
+            return (Criteria) this;
+        }
     }
 
     public static class Criteria extends GeneratedCriteria {

xymanager_dao/src/main/java/com/shxy/xymanager_dao/dao/TerminalUploadDao.java

@@ -6,6 +6,7 @@ import java.util.List;
 import org.apache.ibatis.annotations.Param;
 
 public interface TerminalUploadDao {
+
     long countByExample(TerminalUploadExample example);
 
     int deleteByExample(TerminalUploadExample example);
@@ -27,4 +28,5 @@ public interface TerminalUploadDao {
     int updateByPrimaryKeySelective(TerminalUpload record);
 
     int updateByPrimaryKey(TerminalUpload record);
+
 }

xymanager_dao/src/main/resources/mappers/TerminalBasicInfoHistoryDao.xml

@@ -7,6 +7,11 @@
     <result column="version" jdbcType="VARCHAR" property="version" />
     <result column="bs_id" jdbcType="VARCHAR" property="bsId" />
     <result column="update_time" jdbcType="BIGINT" property="updateTime" />
+    <result column="equip_name" jdbcType="VARCHAR" property="equipName" />
+    <result column="model" jdbcType="VARCHAR" property="model" />
+    <result column="protocol_version" jdbcType="VARCHAR" property="protocolVersion" />
+    <result column="bs_manu" jdbcType="VARCHAR" property="bsManu" />
+    <result column="production_date" jdbcType="DATE" property="productionDate" />
   </resultMap>
   <sql id="Example_Where_Clause">
     <where>
@@ -67,7 +72,8 @@
     </where>
   </sql>
   <sql id="Base_Column_List">
-    term_id, cmdid, version, bs_id, update_time
+    term_id, cmdid, version, bs_id, update_time, equip_name, model, protocol_version, 
+    bs_manu, production_date
   </sql>
   <select id="selectByExample" parameterType="com.shxy.xymanager_common.entity.TerminalBasicInfoHistoryExample" resultMap="BaseResultMap">
     select
@@ -91,9 +97,13 @@
   </delete>
   <insert id="insert" parameterType="com.shxy.xymanager_common.entity.TerminalBasicInfoHistory">
     insert into terminal_basic_info_history (term_id, cmdid, version, 
-      bs_id, update_time)
+      bs_id, update_time, equip_name, 
+      model, protocol_version, bs_manu, 
+      production_date)
     values (#{termId,jdbcType=INTEGER}, #{cmdid,jdbcType=VARCHAR}, #{version,jdbcType=VARCHAR}, 
-      #{bsId,jdbcType=VARCHAR}, #{updateTime,jdbcType=BIGINT})
+      #{bsId,jdbcType=VARCHAR}, #{updateTime,jdbcType=BIGINT}, #{equipName,jdbcType=VARCHAR}, 
+      #{model,jdbcType=VARCHAR}, #{protocolVersion,jdbcType=VARCHAR}, #{bsManu,jdbcType=VARCHAR}, 
+      #{productionDate,jdbcType=DATE})
   </insert>
   <insert id="insertSelective" parameterType="com.shxy.xymanager_common.entity.TerminalBasicInfoHistory">
     insert into terminal_basic_info_history
@@ -113,6 +123,21 @@
       <if test="updateTime != null">
         update_time,
       </if>
+      <if test="equipName != null">
+        equip_name,
+      </if>
+      <if test="model != null">
+        model,
+      </if>
+      <if test="protocolVersion != null">
+        protocol_version,
+      </if>
+      <if test="bsManu != null">
+        bs_manu,
+      </if>
+      <if test="productionDate != null">
+        production_date,
+      </if>
     </trim>
     <trim prefix="values (" suffix=")" suffixOverrides=",">
       <if test="termId != null">
@@ -130,6 +155,21 @@
       <if test="updateTime != null">
         #{updateTime,jdbcType=BIGINT},
       </if>
+      <if test="equipName != null">
+        #{equipName,jdbcType=VARCHAR},
+      </if>
+      <if test="model != null">
+        #{model,jdbcType=VARCHAR},
+      </if>
+      <if test="protocolVersion != null">
+        #{protocolVersion,jdbcType=VARCHAR},
+      </if>
+      <if test="bsManu != null">
+        #{bsManu,jdbcType=VARCHAR},
+      </if>
+      <if test="productionDate != null">
+        #{productionDate,jdbcType=DATE},
+      </if>
     </trim>
   </insert>
   <select id="countByExample" parameterType="com.shxy.xymanager_common.entity.TerminalBasicInfoHistoryExample" resultType="java.lang.Long">
@@ -156,6 +196,21 @@
       <if test="record.updateTime != null">
         update_time = #{record.updateTime,jdbcType=BIGINT},
       </if>
+      <if test="record.equipName != null">
+        equip_name = #{record.equipName,jdbcType=VARCHAR},
+      </if>
+      <if test="record.model != null">
+        model = #{record.model,jdbcType=VARCHAR},
+      </if>
+      <if test="record.protocolVersion != null">
+        protocol_version = #{record.protocolVersion,jdbcType=VARCHAR},
+      </if>
+      <if test="record.bsManu != null">
+        bs_manu = #{record.bsManu,jdbcType=VARCHAR},
+      </if>
+      <if test="record.productionDate != null">
+        production_date = #{record.productionDate,jdbcType=DATE},
+      </if>
     </set>
     <if test="_parameter != null">
       <include refid="Update_By_Example_Where_Clause" />
@@ -167,7 +222,12 @@
       cmdid = #{record.cmdid,jdbcType=VARCHAR},
       version = #{record.version,jdbcType=VARCHAR},
       bs_id = #{record.bsId,jdbcType=VARCHAR},
-      update_time = #{record.updateTime,jdbcType=BIGINT}
+      update_time = #{record.updateTime,jdbcType=BIGINT},
+      equip_name = #{record.equipName,jdbcType=VARCHAR},
+      model = #{record.model,jdbcType=VARCHAR},
+      protocol_version = #{record.protocolVersion,jdbcType=VARCHAR},
+      bs_manu = #{record.bsManu,jdbcType=VARCHAR},
+      production_date = #{record.productionDate,jdbcType=DATE}
     <if test="_parameter != null">
       <include refid="Update_By_Example_Where_Clause" />
     </if>

xymanager_service/src/main/java/com/shxy/xymanager_service/impl/DyLevelServiceImpl.java

@@ -127,6 +127,7 @@ public class DyLevelServiceImpl implements DyLevelService {
                     if (CollectionUtil.isEmpty(towersList)) {
                         continue;
                     }
+                    int line_onlinenum = 0;
                     ArrayList<Towers> tt = new ArrayList<>();
                     for (int k = 0; k < towersList.size(); k++) {
                         Towers towers = towersList.get(k);
@@ -143,21 +144,26 @@ public class DyLevelServiceImpl implements DyLevelService {
                         if (type == null || type.intValue() == -1) {//查询全部
                             if (CommonStatus.EFFECTIVE.value().equals(onlinestatus)) {
                                 onlinenum++;
+                                line_onlinenum++;
                             }
                             tt.add(towers);
                         } else if (type.intValue() == 0) {
                             if (CommonStatus.EFFECTIVE.value().equals(onlinestatus)) {
                                 onlinenum++;
+                                line_onlinenum++;
                             } else {
                                 tt.add(towers);
                             }
                         } else if (type.intValue() == 1) {
                             if (CommonStatus.EFFECTIVE.value().equals(onlinestatus)) {
                                 onlinenum++;
+                                line_onlinenum++;
                                 tt.add(towers);
                             }
                         }
                     }
+                    lines.setOnlinenum(line_onlinenum);
+                    lines.setTotalnum(tt.size());
                     lines.setList(tt);
                 }
             }

xymanager_service/src/main/java/com/shxy/xymanager_service/impl/TerminalServiceImpl.java

@@ -36,7 +36,6 @@ import org.springframework.cache.annotation.CacheEvict;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
-import javax.validation.constraints.NotNull;
 import java.math.BigInteger;
 import java.util.ArrayList;
 import java.util.Date;
@@ -744,54 +743,6 @@ public class TerminalServiceImpl implements TerminalService {
         return Asserts.success(model);
     }
 
-    /**
-     * 获取所有装置列表的详细信息
-     *
-     * @return
-     */
-    @Override
-    public ServiceBody<ProtocolListModel> getAllTermDetailsList() {
-
-//        Map<Integer, TowerDto> towerMap = cacheService.getTowerMap();
-//        Map<Integer, LineAndDyNameDto> lineMap = cacheService.getLineMap();
-//        Map<Integer, TermAndChannelDto> termAndChannelMap = cacheService.getTermAndChannelMap();
-//        Map<Integer, Protocols> protocolMap = cacheService.getProtocolMap();
-//        Integer dyid = vo.getDyId();
-//        Integer lineid = vo.getLineId();
-//        Integer tower = vo.getTowerId();
-//        String search = vo.getSearch();
-//        if (StrUtil.isEmpty(search)) {
-//            search = null;
-//        }
-//        TerminalListModel model = new TerminalListModel();
-//        int pageindex = vo.getPageindex();
-//        int pagesize = vo.getPagesize();
-//        PageUtils.SetPage(pageindex, pagesize);
-//        List<TerminalsAndStatusDto> list2 = terminalsDao.selectTermAndStatusList(null, dyid, lineid, tower, search);
-//
-//        List<TerminalAndLastPicListExcelModel> modellist = new ArrayList<>();
-//        Map<Integer, TowerDto> towerMap = cacheService.getTowerMap();
-//        List<TerminalsAndStatusAndLastPicDto> list = terminalsDao.selectTermAndStatusAndLastPicList(CommonStatus.EFFECTIVE.value());
-
-        return null;
-    }
-
-    /**
-     * 获取装置历史信息列表
-     *
-     * @param vo
-     * @return
-     */
-    @Override
-    public ServiceBody<ProtocolListModel> getTermBasicInfoList(BasicTermVo vo) {
-//        Integer termId = vo.getTermId();
-//        int pageindex = vo.getPageindex();
-//        int pagesize = vo.getPagesize();
-////        terminalBasicInfoHistoryDao.selectByTermiId(termid);
-
-
-        return null;
-    }
 
 
     @Override
@@ -955,7 +906,6 @@ public class TerminalServiceImpl implements TerminalService {
 
     @Override
     public ServiceBody<TableDataInfo<TerminalBasicInfoHistory>> getTermBasicInfoHistory(TermFaultsVo vo) {
-//        Map<Integer, Terminals> terminalMap = cacheService.getTerminalMap();
         Integer termid = vo.getTermid();
         Integer pageindex = vo.getPageindex();
         Integer pagesize = vo.getPagesize();
@@ -975,11 +925,6 @@ public class TerminalServiceImpl implements TerminalService {
             criteria.andUpdateTimeLessThanOrEqualTo(MyDateUtils.TimeMillSecond2Second(endtime));
         }
         List<TerminalBasicInfoHistory> list = terminalBasicInfoHistoryDao.selectByExample(example);
-//        if (CollectionUtil.isNotEmpty(list)) {
-//            for (TerminalBasicInfoHistory item : list) {
-//                item.setCmdid(terminalMap.get(termid).getCmdid());
-//            }
-//        }
         TableDataInfo dataTable = PageUtils.getDataTable(list);
         return Asserts.success(dataTable);
     }

xymanager_service/src/main/java/com/shxy/xymanager_service/service/TerminalService.java

@@ -138,18 +138,6 @@ public interface TerminalService {
      */
     ServiceBody<ProtocolListModel> getProtocolList();
 
-    /**
-     * 获取所有装置的详细列表的具体信息
-     * @return
-     */
-    ServiceBody<ProtocolListModel> getAllTermDetailsList();
-
-    /**
-     * 获取装置历史信息列表
-     * @param vo
-     * @return
-     */
-    ServiceBody<ProtocolListModel> getTermBasicInfoList(BasicTermVo vo);
 
     /**
      * 新增收藏夹功能