新增查询接口，前端、后端入参格式更改

wangfei

2024-11-18 5b9bb0019df41866593c0cc18f45369fa8af6ec8

新增查询接口，前端、后端入参格式更改

 UI-Project/config.js

@@ -1,10 +1,10 @@
export default {
    serverUrl: "10.153.19.150:88/api",
    // serverUrl: "10.153.19.150:88/api",
//  serverUrl: "192.168.1.199:88/api",
    // serverUrl: "127.0.0.1:88/api",
    serverUrl2: "10.153.19.150:88"
    serverUrl: "127.0.0.1:88/api",
    // serverUrl2: "10.153.19.150:88"
    // serverUrl2: "192.168.1.199:88"
    // serverUrl2: "127.0.0.1:88"
    serverUrl2: "127.0.0.1:88"

    //serverUrl:"res.abeim.cn"
}

 UI-Project/src/utils/constants.js

@@ -1,4 +1,4 @@
//  export const WebSocketHost = "192.168.1.199";
export const WebSocketHost = "10.153.19.150";
// export const WebSocketHost = "127.0.0.1";
// export const WebSocketHost = "10.153.19.150";
export const WebSocketHost = "127.0.0.1";
export const host = "88";

 UI-Project/src/views/Returns/upreturns.vue

@@ -179,8 +179,9 @@
    }
  }
  const response = await request.post("/loadGlass/up-patten-usage/setUpPattenRequest", {
    taskState: stateList,
    taskType: 5
    state: selectValuesa[0],
    // state: stateList,
    stationCell: 5
  })
  if (response.code === 200) {
    tableData.value = response.data;

 UI-Project/src/views/Returns/upreturns2.vue

@@ -121,7 +121,8 @@
  let engineeringId = window.localStorage.getItem('engineeringId')
  if (markingMachineStatus.value === 'green' && cuttingMachineStatus.value === 'green') {
    try {
      const response = await request.post('/loadGlass/engineering/engineering/changeTask', {
      const response = await request.post('/loadGlass/engineering/engineering/pauseTask', {
        // const response = await request.post('/loadGlass/engineering/engineering/changeTask', {
        stationCell: 6,
        filmRemove: filmRemove,
        engineerId: engineeringId,
@@ -149,7 +150,7 @@
    if (engineeringId !== '') {
      const response = await request.post('/loadGlass/engineering/engineering/pauseTask', {
        stationCell: 6,
        engineeringId: engineeringId,
        engineerId: engineeringId,
        state: 0,
      })
      if (response.code == 200) {
@@ -178,8 +179,9 @@
    }
  }
  const response = await request.post("/loadGlass/up-patten-usage/setUpPattenRequest", {
    taskState: stateList,
    taskType: 6
    state: selectValuesa[0],
    // state: stateList,
    stationCell: 6
  })
  if (response.code === 200) {
    tableData.value = response.data;
@@ -396,7 +398,7 @@
      </div>
    </template>
  </el-dialog>
  </div>
    </div>
  <el-dialog v-model="dialogFormVisible" top="24vh" width="70%">
    <div class="flex-container" style="margin-left: 50px;margin-bottom: 10px;">
      <el-form-item :label="$t('Mounting.loadingline')" :required="true">

 hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/job/PlcStorageCageTask.java

@@ -22,7 +22,6 @@
import com.mes.bigstoragetask.service.BigStorageCageOutTaskService;
import com.mes.common.S7object;
import com.mes.common.config.Const;
import com.mes.common.utils.RedisUtil;
import com.mes.damage.entity.Damage;
import com.mes.damage.service.DamageService;
import com.mes.device.PlcParameterObject;
@@ -33,6 +32,7 @@
import com.mes.temperingglass.entity.TemperingGlassInfo;
import com.mes.temperingglass.service.TemperingGlassInfoService;
import com.mes.tools.S7control;
import com.mes.utils.RedisUtil;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang.StringUtils;
import org.springframework.beans.BeanUtils;

 hangzhoumesParent/moduleService/GlassStorageModule/src/main/resources/application-dev.yml

@@ -17,7 +17,7 @@
  cloud:
    nacos:
      discovery:
        server-addr: 10.153.19.150:8848
        server-addr: 127.0.0.1:8848
  redis:
    database: 0
    host: 127.0.0.1

 hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/uppattenusage/controller/UpPattenUsageController.java

@@ -82,7 +82,8 @@
    @ApiOperation("设置上片查询条件")
    @PostMapping("/setUpPattenRequest")
    public Result setRawGlassTaskRequest(@RequestBody Engineering request) {
        return Result.build(200, "查询成功", upPattenUsageService.Engineering(request));
        log.info("查询上片信息:{}", request);
        return Result.build(200, "查询成功", upPattenUsageService.setRawGlassTaskRequest(request));
    }
}


 hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/uppattenusage/service/UpPattenUsageService.java

@@ -60,6 +60,6 @@
      */
     Boolean updateGlassState(UpPattenUsage upPattenUsage);

     Object Engineering(Engineering request);
     List<Engineering> setRawGlassTaskRequest(Engineering request);
}


 hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/uppattenusage/service/impl/UpPattenUsageServiceImpl.java

@@ -7,6 +7,7 @@
import com.github.yulichang.base.MPJBaseServiceImpl;
import com.github.yulichang.query.MPJQueryWrapper;
import com.mes.engineering.entity.Engineering;
import com.mes.engineering.mapper.EngineeringMapper;
import com.mes.engineering.service.EngineeringService;
import com.mes.pp.entity.OptimizeProject;
import com.mes.pp.mapper.OptimizeProjectMapper;
@@ -44,10 +45,10 @@
        //log.info("将参数传入到查询类里{}",engineering);
        if(engineering!=null){
            LambdaQueryWrapper<UpPattenUsage> wrapper = new LambdaQueryWrapper<>();
            wrapper.eq(UpPattenUsage::getEngineeringId,engineering.getEngineerId());
            wrapper.eq(UpPattenUsage::getEngineeringId, engineering.getEngineerId());
            return this.list(wrapper);
        }else {
            return  null;
        } else {
            return null;
        }

    }

 hangzhoumesParent/moduleService/LoadGlassModule/src/main/resources/application-dev.yml

@@ -10,12 +10,12 @@
          password: beibo.123/
          driver-class-name: com.mysql.cj.jdbc.Driver
        pp:
          url: jdbc:mysql://127.0.0.1:3306/pp?serverTimezone=GMT%2b8
          url: jdbc:mysql://10.153.19.150:3306/pp?serverTimezone=GMT%2b8
          username: root
          password: beibo.123/
          driver-class-name: com.mysql.cj.jdbc.Driver
        sd:
          url: jdbc:mysql://127.0.0.1:3306/sd?serverTimezone=GMT%2b8
          url: jdbc:mysql://10.153.19.150:3306/sd?serverTimezone=GMT%2b8
          username: root
          password: beibo.123/
          driver-class-name: com.mysql.cj.jdbc.Driver

 hangzhoumesParent/moduleService/TemperingGlassModule/src/main/resources/application-prod.yml

@@ -34,4 +34,6 @@
    database: 0
    host: 10.153.19.150
    port: 6379
    password: 123456
    password: 123456
  liquibase:
    change-log: classpath:changelog/changelogBase.xml

 hangzhoumesParent/moduleService/TemperingGlassModule/src/main/resources/application.yml

@@ -2,11 +2,11 @@
  port: 8084
spring:
  profiles:
    active: cz
    active: prod
  application:
    name: temperingGlass
  liquibase:
    enabled: false
    enabled: true
mybatis-plus:
  mapper-locations: classpath*:mapper/*.xml
  configuration: