春风项目四线(合箱线、总装线)
懒羊羊
2024-01-18 f5af64aebfcf92d86da144315b0bb4e2a4dca98f
作业指导工位配置
已修改3个文件
已添加1个文件
100 ■■■■■ 文件已修改
jcdm-main/src/main/java/com/jcdm/main/sc/stationConf/controller/ScStationConfController.java 13 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
jcdm-main/src/main/java/com/jcdm/main/util/IpInfoUtils.java 63 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
jcdm-ui/src/api/main/sc/stationConf.js 8 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
jcdm-ui/src/views/main/cfkb/Instructions/index.vue 16 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
jcdm-main/src/main/java/com/jcdm/main/sc/stationConf/controller/ScStationConfController.java
@@ -1,7 +1,11 @@
package com.jcdm.main.sc.stationConf.controller;
import java.util.List;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import com.jcdm.main.util.IpInfoUtils;
import org.aspectj.weaver.loadtime.Aj;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping;
@@ -101,4 +105,13 @@
    {
        return toAjax(scStationConfService.deleteScStationConfByIds(ids));
    }
    /**
     * æŸ¥è¯¢ip
     */
    @GetMapping("/getIp")
    public AjaxResult getIp(HttpServletRequest request)
    {
        return AjaxResult.success(IpInfoUtils.getIpAddr(request));
    }
}
jcdm-main/src/main/java/com/jcdm/main/util/IpInfoUtils.java
¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,63 @@
package com.jcdm.main.util;
import javax.servlet.http.HttpServletRequest;
import java.net.InetAddress;
import java.net.UnknownHostException;
/**
 * ip工具类
 *
 * @author fengshuonan
 * @Date 2018/9/27 ä¸Šåˆ10:47
 */
public class IpInfoUtils {
    /**
     * èŽ·å–客户端IP地址
     */
    public static String getIpAddr(HttpServletRequest request) {
        String ip = request.getHeader("x-forwarded-for");
        if (ip == null || ip.length() == 0 || "unknown".equalsIgnoreCase(ip)) {
            ip = request.getHeader("Proxy-Client-IP");
        }
        if (ip == null || ip.length() == 0 || "unknown".equalsIgnoreCase(ip)) {
            ip = request.getHeader("WL-Proxy-Client-IP");
        }
        if (ip == null || ip.length() == 0 || "unknown".equalsIgnoreCase(ip)) {
            ip = request.getRemoteAddr();
            if (ip.equals("127.0.0.1")) {
                //根据网卡取本机配置的IP
                InetAddress inet = null;
                try {
                    inet = InetAddress.getLocalHost();
                } catch (UnknownHostException e) {
                    e.printStackTrace();
                }
                ip = inet.getHostAddress();
            }
        }
        // å¯¹äºŽé€šè¿‡å¤šä¸ªä»£ç†çš„情况,第一个IP为客户端真实IP,多个IP按照','分割
        if (ip != null && ip.length() > 15) {
            if (ip.indexOf(",") > 0) {
                ip = ip.substring(0, ip.indexOf(","));
            }
        }
        if ("0:0:0:0:0:0:0:1".equals(ip)) {
            ip = "127.0.0.1";
        }
        return ip;
    }
    /**
     * èŽ·å–客户端主机名称
     */
    public static String getHostName() {
        try {
            return InetAddress.getLocalHost().getHostName();
        } catch (UnknownHostException e) {
        }
        return "未知";
    }
}
jcdm-ui/src/api/main/sc/stationConf.js
@@ -9,6 +9,14 @@
  })
}
// æŸ¥è¯¢Ip
export function getIp() {
  return request({
    url: '/sc/stationConf/getIp',
    method: 'get',
  })
}
// æŸ¥è¯¢å·¥ä½ç»ˆç«¯é…ç½®è¯¦ç»†
export function getStationConf(id) {
  return request({
jcdm-ui/src/views/main/cfkb/Instructions/index.vue
@@ -14,7 +14,7 @@
      </el-col>
      <el-col :span="15">
        <el-card shadow="always">
          <span class="centerText">装副轴,拨叉</span>
          <span class="centerText">{{locationName}}</span>
        </el-card>
      </el-col>
    </el-row>
@@ -74,11 +74,13 @@
<script>
import {listFormulaChild} from "@/api/main/bs/formulaChild/formulaChild";
import {listStationConf,getIp} from "@/api/main/sc/stationConf";
export default {
  name: "index",
  data() {
    return {
      locationName: "未配置工位",
      queryParams: {
        pageNum: 1,
        pageSize: 10,
@@ -143,6 +145,7 @@
    this.tableData = []
  },
  mounted() {
    this.getStationConf()
    this.changeProducts(this.productCode)
    this.getNowTime()
    // this.autoShow()
@@ -151,6 +154,17 @@
  //   currentTime:
  // },
  methods: {
    /** æŸ¥è¯¢å·¥ä½ç»ˆç«¯é…ç½®åˆ—表 */
    getStationConf() {
      getIp().then(response => {
        let queryParams = {
          ipAddress: response.msg,
        }
        listStationConf(queryParams).then(response => {
          this.locationName = response.rows[0].processesName
        });
      });
    },
    //获取当前时间
    getNowTime () {
      let speed = 1000