root/rongLiJiaNai
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of http://121.40.234.130:8899/root/rongLiJiaNai

Browse Source
This commit is contained in:
loujf
2022-08-16 19:46:10 +08:00
parent 101ab92547 258d35c37b
commit b7c0d7e387
112 changed files with 5640 additions and 960 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
acs/hd/nladmin-system/src/main/java/org/nl/acs/agv/server/MagicAgvService.java Normal file
View File

@@ -0,0 +1,9 @@
package org.nl.acs.agv.server;
/**
* @Author: lyd
* @Description:
* @Date: 2022-08-15
*/
public interface MagicAgvService {
}

9
acs/hd/nladmin-system/src/main/java/org/nl/acs/agv/server/NDCAgvService.java Normal file
View File

@@ -0,0 +1,9 @@
package org.nl.acs.agv.server;
/**
* @Author: lyd
* @Description:
* @Date: 2022-08-15
*/
public interface NDCAgvService {
}

9
acs/hd/nladmin-system/src/main/java/org/nl/acs/agv/server/XianGongAgvService.java Normal file
View File

@@ -0,0 +1,9 @@
package org.nl.acs.agv.server;
/**
* @Author: lyd
* @Description:
* @Date: 2022-08-15
*/
public interface XianGongAgvService {
}

9
acs/hd/nladmin-system/src/main/java/org/nl/acs/agv/server/ZheDaAgvService.java Normal file
View File

@@ -0,0 +1,9 @@
package org.nl.acs.agv.server;
/**
* @Author: lyd
* @Description:
* @Date: 2022-08-15
*/
public interface ZheDaAgvService {
}

8
acs/hd/nladmin-system/src/main/java/org/nl/acs/config/rest/AcsConfigController.java
View File

@@ -82,4 +82,12 @@ public class AcsConfigController {
return new ResponseEntity<>(acsConfigService.findConfigFromCache(), HttpStatus.OK);
}
@PostMapping("/getStageCodeByCode")
@Log("根据编码获取舞台编码")
@ApiOperation("根据编码获取舞台编码")
public ResponseEntity<Object> getStageCodeByCode(@RequestBody String code) {
System.out.println(code);
return new ResponseEntity<>(acsConfigService.findByCode(code), HttpStatus.CREATED);
}
}

2
acs/hd/nladmin-system/src/main/java/org/nl/acs/ext/wms/service/impl/WmsToAcsServiceImpl.java
View File

@@ -257,7 +257,7 @@ public class WmsToAcsServiceImpl implements WmsToAcsService {
try {
MDC.put(log_file_type, log_type);
JSONArray orders = JSONArray.parseArray(param);
log.info("createOrder--------------:输入参数：" + orders.toString());
log.info("createOrder--------------:输入参数：" + orders.toString());
for (int i = 0; i < orders.size(); i++) {
Boolean is_flag = false;

107
acs/hd/nladmin-system/src/main/java/org/nl/acs/stage/rest/StageActorController.java
View File

@@ -1,107 +0,0 @@
package org.nl.acs.stage.rest;
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.nl.acs.stage.service.StageActorService;
import org.nl.acs.stage.service.dto.StageActorDto;
import org.nl.annotation.Log;
import org.springframework.data.domain.Pageable;
import org.springframework.http.HttpStatus;
import org.springframework.http.ResponseEntity;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
import javax.servlet.http.HttpServletResponse;
import java.io.IOException;
import java.util.Map;
/**
* @author ldjun
* @date 2021-04-12
**/
@RestController
@RequiredArgsConstructor
@Api(tags = "舞台演员管理")
@RequestMapping("/api/stageActor")
@Slf4j
public class StageActorController {
private final StageActorService stageActorService;
@GetMapping
@Log("查询舞台演员")
@ApiOperation("查询舞台演员")
//@PreAuthorize("@el.check('stageActor:list')")
public ResponseEntity<Object> query(@RequestParam Map whereJson, Pageable page) {
return new ResponseEntity<>(stageActorService.queryAll(whereJson, page), HttpStatus.OK);
}
@PostMapping
@Log("新增舞台演员")
@ApiOperation("新增舞台演员")
//@PreAuthorize("@el.check('stageActor:add')")
public ResponseEntity<Object> create(@Validated @RequestBody StageActorDto dto) {
stageActorService.create(dto);
return new ResponseEntity<>(HttpStatus.CREATED);
}
@PutMapping
@Log("修改舞台演员")
@ApiOperation("修改舞台演员")
//@PreAuthorize("@el.check('stageActor:edit')")
public ResponseEntity<Object> update(@Validated @RequestBody StageActorDto dto) {
stageActorService.update(dto);
return new ResponseEntity<>(HttpStatus.NO_CONTENT);
}
@Log("删除舞台演员")
@ApiOperation("删除舞台演员")
//@PreAuthorize("@el.check('stageActor:del')")
@DeleteMapping
public ResponseEntity<Object> delete(@RequestBody String[] ids) {
stageActorService.deleteAll(ids);
return new ResponseEntity<>(HttpStatus.OK);
}
@Log("导出舞台演员")
@ApiOperation("导出舞台演员")
@GetMapping(value = "/download")
//@PreAuthorize("@el.check('stageActor:list')")
public void download(HttpServletResponse response, Map whereJson) throws IOException {
stageActorService.download(stageActorService.queryAll(whereJson), response);
}
@PostMapping("/saveData")
@Log("保存舞台演员")
@ApiOperation("修改舞台演员")
//@PreAuthorize("@el.check('stageActor:edit')")
public ResponseEntity<Object> saveData(@RequestBody Map map) throws IOException {
String stage_code = (String) map.get("stage_code");
String grid_width = String.valueOf(map.get("grid_width"));
String grid_length = String.valueOf(map.get("grid_length"));
JSONArray actors = JSONArray.parseArray((JSON.toJSONString(map.get("list"))));
JSONObject mstForm = new JSONObject();
mstForm.put("stage_code", stage_code);
mstForm.put("grid_width", grid_width);
mstForm.put("grid_length", grid_length);
stageActorService.saveData(mstForm, actors);
return new ResponseEntity<>(HttpStatus.NO_CONTENT);
}
@GetMapping("/queryStageActor/{stage_code}")
@Log("查询舞台演员")
@ApiOperation("查询舞台演员")
//@PreAuthorize("@el.check('stageActor:list')")
public ResponseEntity<Object> queryStageActor(@PathVariable String stage_code) throws Exception {
return new ResponseEntity<>(stageActorService.queryStageActorByStageCode(stage_code), HttpStatus.OK);
}
}

103
acs/hd/nladmin-system/src/main/java/org/nl/acs/stage/service/StageActorService.java
View File

@@ -1,103 +0,0 @@
package org.nl.acs.stage.service;
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import org.nl.acs.stage.service.dto.StageActorDto;
import org.springframework.data.domain.Pageable;
import javax.servlet.http.HttpServletResponse;
import java.io.IOException;
import java.util.List;
import java.util.Map;
/**
* @author ldjun
* @description 服务接口
* @date 2021-04-12
**/
public interface StageActorService {
/**
* 查询数据分页
*
* @param whereJson 条件
* @param page 分页参数
* @return Map<String, Object>
*/
Map<String, Object> queryAll(Map whereJson, Pageable page);
/**
* 查询所有数据不分页
*
* @param whereJson 条件参数
* @return List<StageActorDto>
*/
List<StageActorDto> queryAll(Map whereJson);
/**
* 根据ID查询
*
* @param actor_uuid ID
* @return StageActor
*/
StageActorDto findById(String actor_uuid);
/**
* 根据编码查询
*
* @param code code
* @return StageActor
*/
StageActorDto findByCode(String code);
/**
* 创建
*
* @param dto /
*/
void create(StageActorDto dto);
/**
* 编辑
*
* @param dto /
*/
void update(StageActorDto dto);
/**
* 多选删除
*
* @param ids /
*/
void deleteAll(String[] ids);
/**
* 导出数据
*
* @param dtos 待导出的数据
* @param response /
* @throws IOException /
*/
void download(List<StageActorDto> dtos, HttpServletResponse response) throws IOException;
/**
* 舞台编辑时候保存数据
*
* @param mstForm 舞台编码
* @param array 舞台演员明细
* @throws IOException
*/
void saveData(JSONObject mstForm, JSONArray array) throws IOException;
/**
* 根据舞台编码查询舞台演员
*
* @param stage_code 舞台编码
* @return
*/
JSONObject queryStageActorByStageCode(String stage_code) throws Exception;
}

85
acs/hd/nladmin-system/src/main/java/org/nl/acs/stage/service/dto/StageActorDto.java
View File

@@ -1,85 +0,0 @@
package org.nl.acs.stage.service.dto;
import lombok.Data;
import java.io.Serializable;
import java.math.BigDecimal;
/**
* @author ldjun
* @description /
* @date 2021-04-12
**/
@Data
public class StageActorDto implements Serializable {
/**
* 图标标识
*/
private String actor_uuid;
/**
* 设备编码
*/
private String device_code;
/**
* 图标名字
*/
private String device_name;
/**
* 图标名字
*/
private String image_name;
/**
* 图标名字
*/
private String angle;
/**
* 舞台标识
*/
private String stage_uuid;
/**
* 备注
*/
private String remark;
/**
* 是否启用
*/
private String is_active;
/**
* 是否删除
*/
private String is_delete;
/**
* 创建者
*/
private String create_by;
/**
* 创建时间
*/
private String create_time;
/**
* 修改者
*/
private String update_by;
/**
* 修改时间
*/
private String update_time;
/**
* 数组下标
*/
private BigDecimal index_seq;
}

150
acs/hd/nladmin-system/src/main/java/org/nl/acs/stage/service/impl/StageServiceImpl.java
View File

@@ -1,150 +0,0 @@
package org.nl.acs.stage.service.impl;
import cn.hutool.core.date.DateUtil;
import cn.hutool.core.util.IdUtil;
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.nl.acs.stage.service.StageService;
import org.nl.acs.stage.service.dto.StageDto;
import org.nl.exception.BadRequestException;
import org.nl.utils.FileUtil;
import org.nl.utils.SecurityUtils;
import org.nl.wql.core.bean.ResultBean;
import org.nl.wql.core.bean.WQLObject;
import org.nl.wql.util.WqlUtil;
import org.springframework.data.domain.Pageable;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import javax.servlet.http.HttpServletResponse;
import java.io.IOException;
import java.util.ArrayList;
import java.util.LinkedHashMap;
import java.util.List;
import java.util.Map;
/**
* @author ldjun
* @description 服务实现
* @date 2021-04-12
**/
@Service
@RequiredArgsConstructor
@Slf4j
public class StageServiceImpl implements StageService {
@Override
public Map<String, Object> queryAll(Map whereJson, Pageable page) {
WQLObject wo = WQLObject.getWQLObject("acs_stage");
ResultBean rb = wo.pagequery(WqlUtil.getHttpContext(page), "", "update_time desc");
final JSONObject json = rb.pageResult();
return json;
}
@Override
public List<StageDto> queryAll(Map whereJson) {
WQLObject wo = WQLObject.getWQLObject("acs_stage");
JSONArray arr = wo.query().getResultJSONArray(0);
List<StageDto> list = JSONObject.parseArray(arr.toJSONString(), StageDto.class);
return list;
}
@Override
public StageDto findById(String stage_uuid) {
WQLObject wo = WQLObject.getWQLObject("acs_stage");
JSONObject json = wo.query("stage_uuid ='" + stage_uuid + "'").uniqueResult(0);
final StageDto obj = json.toJavaObject(StageDto.class);
return obj;
}
@Override
public StageDto findByCode(String code) {
WQLObject wo = WQLObject.getWQLObject("acs_stage");
JSONObject json = wo.query("code ='" + code + "'").uniqueResult(0);
final StageDto obj = json.toJavaObject(StageDto.class);
return obj;
}
@Override
@Transactional(rollbackFor = Exception.class)
public void create(StageDto dto) {
String currentUsername = SecurityUtils.getCurrentUsername();
String now = DateUtil.now();
dto.setStage_uuid(IdUtil.simpleUUID());
dto.setCreate_by(currentUsername);
dto.setUpdate_by(currentUsername);
dto.setUpdate_time(now);
dto.setCreate_time(now);
WQLObject wo = WQLObject.getWQLObject("acs_stage");
JSONObject json = (JSONObject) JSONObject.toJSON(dto);
wo.insert(json);
}
@Override
@Transactional(rollbackFor = Exception.class)
public void update(StageDto dto) {
StageDto entity = this.findById(dto.getStage_uuid());
if (entity == null) throw new BadRequestException("被删除或无权限，操作失败!");
String currentUsername = SecurityUtils.getCurrentUsername();
String now = DateUtil.now();
dto.setUpdate_time(now);
dto.setUpdate_by(currentUsername);
WQLObject wo = WQLObject.getWQLObject("acs_stage");
JSONObject json = (JSONObject) JSONObject.toJSON(dto);
wo.update(json);
}
@Override
@Transactional(rollbackFor = Exception.class)
public void deleteAll(String[] ids) {
WQLObject wo = WQLObject.getWQLObject("acs_stage");
for (String stage_uuid : ids) {
wo.delete("stage_uuid = '" + stage_uuid + "'");
}
}
@Override
public void download(List<StageDto> all, HttpServletResponse response) throws IOException {
List<Map<String, Object>> list = new ArrayList<>();
for (StageDto stage : all) {
Map<String, Object> map = new LinkedHashMap<>();
map.put("舞台编码", stage.getStage_code());
map.put("舞台名字", stage.getStage_name());
map.put("备注", stage.getRemark());
map.put("是否启用", stage.getIs_active());
map.put("是否删除", stage.getIs_delete());
map.put("创建者", stage.getCreate_by());
map.put("创建时间", stage.getCreate_time());
map.put("修改者", stage.getUpdate_by());
map.put("修改时间", stage.getUpdate_time());
list.add(map);
}
FileUtil.downloadExcel(list, response);
}
@Override
public JSONArray selectList() {
//设备基础信息表【acs_stage】
JSONArray arr = WQLObject.getWQLObject("acs_stage").query("is_delete= '0' AND is_active= '1'").getResultJSONArray(0);
JSONArray result = new JSONArray();
for (int i = 0; i < arr.size(); i++) {
JSONObject obj = arr.getJSONObject(i);
JSONObject json = new JSONObject();
json.put("stage_id", obj.getString("stage_id"));
json.put("stage_code", obj.getString("stage_code"));
json.put("stage_name", obj.getString("stage_name"));
result.add(json);
}
return result;
}
}

61
acs/hd/nladmin-system/src/main/java/org/nl/acs/stage/wql/QStage_01.wql
View File

@@ -1,61 +0,0 @@
[交易说明]
交易名： 根据设备查询舞台编码
所属模块：
功能简述：
版权所有：
表引用：
版本经历：
[数据库]
--指定数据库，为空采用默认值，默认为db.properties中列出的第一个库
[IO定义]
#################################################
## 表字段对应输入参数
#################################################
输入.flag TYPEAS s_string
//设备编码
输入.device_code TYPEAS s_string
[临时表]
--这边列出来的临时表就会在运行期动态创建
[临时变量]
--所有中间过程变量均可在此处定义
[业务过程]
##########################################
# 1、输入输出检查 #
##########################################
##########################################
# 2、主过程前处理 #
##########################################
##########################################
# 3、业务主过程 #
##########################################
IF 输入.flag = "1"
QUERY
SELECT
stage_code
FROM
acs_stage
WHERE
stage_uuid IN (
SELECT
stage_uuid
FROM
acs_stage_actor
WHERE
1=1
OPTION 输入.device_code <> ""
device_code = 输入.device_code
ENDOPTION
)
ENDSELECT
ENDQUERY
ENDIF

54
acs/hd/nladmin-system/src/main/java/org/nl/acs/stage/rest/StageController.java → acs/hd/nladmin-system/src/main/java/org/nl/logicflow/rest/StageController.java
View File

@@ -1,37 +1,34 @@
package org.nl.logicflow.rest;
package org.nl.acs.stage.rest;
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.nl.acs.stage.service.StageService;
import org.nl.acs.stage.service.dto.StageDto;
import org.nl.annotation.Log;
import org.nl.logicflow.service.StageService;
import org.nl.logicflow.service.dto.StageDto;
import org.springframework.data.domain.Pageable;
import org.springframework.http.HttpStatus;
import org.springframework.http.ResponseEntity;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
import javax.servlet.http.HttpServletResponse;
import java.io.IOException;
import java.util.Map;
/**
* @author ldjun
* @date 2021-04-12
**/
* @Author: lyd
* @Description: 舞台管理
* @Date: 2022-08-15
*/
@RestController
@RequiredArgsConstructor
@Api(tags = "舞台管理")
@RequestMapping("/api/stage")
@Slf4j
public class StageController {
private final StageService stageService;
@GetMapping
@Log("查询舞台")
@ApiOperation("查询舞台")
@@ -67,14 +64,6 @@ public class StageController {
return new ResponseEntity<>(HttpStatus.OK);
}
@Log("导出舞台")
@ApiOperation("导出舞台")
@GetMapping(value = "/download")
//@PreAuthorize("@el.check('stage:list')")
public void download(HttpServletResponse response, Map whereJson) throws IOException {
stageService.download(stageService.queryAll(whereJson), response);
}
@GetMapping("/selectList")
@Log("下拉选舞台")
@ApiOperation("下拉选舞台")
@@ -82,4 +71,29 @@ public class StageController {
public ResponseEntity<Object> selectList() {
return new ResponseEntity<>(stageService.selectList(), HttpStatus.OK);
}
@PostMapping("/addNewStage")
@Log("保存舞台数据")
@ApiOperation("保存舞台数据")
public ResponseEntity<Object> addNewStage(@Validated @RequestBody StageDto dto) {
log.info("dto{}",dto);
stageService.addNewStage(dto);
return new ResponseEntity<>(HttpStatus.CREATED);
}
@PostMapping("/getNewStageDataByCode")
@Log("根据stage_code获取舞台数据")
@ApiOperation("根据stage_code获取舞台数据")
public ResponseEntity<Object> getNewStageDataByCode(@RequestBody String code) {
return new ResponseEntity<>(stageService.findByCode(code), HttpStatus.CREATED);
}
@PostMapping("/getDeviceByCodes")
@Log("获取舞台设备信息")
@ApiOperation("获取舞台设备信息")
public ResponseEntity<Object> getDeviceByCodes(@RequestBody String json) throws Exception{
JSONArray jsonArray = JSONArray.parseArray(json);
return new ResponseEntity<>(stageService.getDeviceByCodes(jsonArray),HttpStatus.OK);
}
}

30
acs/hd/nladmin-system/src/main/java/org/nl/acs/stage/rest/StageImageController.java → acs/hd/nladmin-system/src/main/java/org/nl/logicflow/rest/StageImageController.java
View File

@@ -1,35 +1,31 @@
package org.nl.acs.stage.rest;
package org.nl.logicflow.rest;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.nl.acs.stage.service.StageImageService;
import org.nl.acs.stage.service.dto.StageImageDto;
import org.nl.annotation.Log;
import org.nl.logicflow.service.StageImageService;
import org.nl.logicflow.service.dto.StageImageDto;
import org.springframework.data.domain.Pageable;
import org.springframework.http.HttpStatus;
import org.springframework.http.ResponseEntity;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
import javax.servlet.http.HttpServletResponse;
import java.io.IOException;
import java.util.Map;
/**
* @author zhouz
* @date 2021-04-06
**/
* @Author: lyd
* @Description: 舞台图标控制层
* @Date: 2022-08-16
*/
@RestController
@RequiredArgsConstructor
@Api(tags = "舞台管理")
@RequestMapping("/api/stageImage")
@Slf4j
public class StageImageController {
private final StageImageService stageImageService;
@GetMapping
@@ -67,11 +63,11 @@ public class StageImageController {
return new ResponseEntity<>(HttpStatus.OK);
}
@Log("导出舞台")
@ApiOperation("导出舞台")
@GetMapping(value = "/download")
//@PreAuthorize("@el.check('stageImage:list')")
public void download(HttpServletResponse response, Map whereJson) throws IOException {
stageImageService.download(stageImageService.queryAll(whereJson), response);
@GetMapping("/selectList")
@Log("下拉选设备图标")
@ApiOperation("下拉选设备图标")
//@PreAuthorize("@el.check('routePlan:list')")
public ResponseEntity<Object> selectList() {
return new ResponseEntity<>(stageImageService.selectList(), HttpStatus.OK);
}
}

59
acs/hd/nladmin-system/src/main/java/org/nl/acs/stage/service/StageImageService.java → acs/hd/nladmin-system/src/main/java/org/nl/logicflow/service/StageImageService.java
View File

@@ -1,21 +1,17 @@
package org.nl.logicflow.service;
package org.nl.acs.stage.service;
import org.nl.acs.stage.service.dto.StageImageDto;
import com.alibaba.fastjson.JSONArray;
import org.nl.logicflow.service.dto.StageImageDto;
import org.springframework.data.domain.Pageable;
import javax.servlet.http.HttpServletResponse;
import java.io.IOException;
import java.util.List;
import java.util.Map;
/**
* @author zhouz
* @description 服务接口
* @date 2021-04-06
**/
* @Author: lyd
* @Description: 舞台图标的服务层
* @Date: 2022-08-16
*/
public interface StageImageService {
/**
* 查询数据分页
*
@@ -25,31 +21,6 @@ public interface StageImageService {
*/
Map<String, Object> queryAll(Map whereJson, Pageable page);
/**
* 查询所有数据不分页
*
* @param whereJson 条件参数
* @return List<StageImageDto>
*/
List<StageImageDto> queryAll(Map whereJson);
/**
* 根据ID查询
*
* @param image_uuid ID
* @return StageImage
*/
StageImageDto findById(String image_uuid);
/**
* 根据编码查询
*
* @param code code
* @return StageImage
*/
StageImageDto findByCode(String code);
/**
* 创建
*
@@ -64,6 +35,14 @@ public interface StageImageService {
*/
void update(StageImageDto dto);
/**
* 根据ID查询
*
* @param image_uuid ID
* @return StageImage
*/
StageImageDto findById(String image_uuid);
/**
* 多选删除
*
@@ -72,11 +51,9 @@ public interface StageImageService {
void deleteAll(String[] ids);
/**
* 导出数据
* 前端舞台编辑选择设备图标下拉选列表
*
* @param dtos 待导出的数据
* @param response /
* @throws IOException /
* @return
*/
void download(List<StageImageDto> dtos, HttpServletResponse response) throws IOException;
JSONArray selectList();
}

84
acs/hd/nladmin-system/src/main/java/org/nl/acs/stage/service/StageService.java → acs/hd/nladmin-system/src/main/java/org/nl/logicflow/service/StageService.java
View File

@@ -1,23 +1,18 @@
package org.nl.acs.stage.service;
package org.nl.logicflow.service;
import com.alibaba.fastjson.JSONArray;
import org.nl.acs.stage.service.dto.StageDto;
import com.alibaba.fastjson.JSONObject;
import org.nl.logicflow.service.dto.StageDto;
import org.springframework.data.domain.Pageable;
import javax.servlet.http.HttpServletResponse;
import java.io.IOException;
import java.util.List;
import java.util.Map;
/**
* @author ldjun
* @description 服务接口
* @date 2021-04-12
**/
* @Author: lyd
* @Description:
* @Date: 2022-08-15
*/
public interface StageService {
/**
* 查询数据分页
*
@@ -27,31 +22,6 @@ public interface StageService {
*/
Map<String, Object> queryAll(Map whereJson, Pageable page);
/**
* 查询所有数据不分页
*
* @param whereJson 条件参数
* @return List<StageDto>
*/
List<StageDto> queryAll(Map whereJson);
/**
* 根据ID查询
*
* @param stage_uuid ID
* @return Stage
*/
StageDto findById(String stage_uuid);
/**
* 根据编码查询
*
* @param code code
* @return Stage
*/
StageDto findByCode(String code);
/**
* 创建
*
@@ -66,6 +36,14 @@ public interface StageService {
*/
void update(StageDto dto);
/**
* 根据ID查询
*
* @param stage_uuid ID
* @return Stage
*/
StageDto findById(String stage_uuid);
/**
* 多选删除
*
@@ -73,20 +51,32 @@ public interface StageService {
*/
void deleteAll(String[] ids);
/**
* 导出数据
*
* @param dtos 待导出的数据
* @param response /
* @throws IOException /
*/
void download(List<StageDto> dtos, HttpServletResponse response) throws IOException;
/**
* 前端舞台下拉选列表
*
* @return
*/
JSONArray selectList();
/**
* 新增舞台信息
* 将数据保存到remark---保存数据
* @param dto
*/
void addNewStage(StageDto dto);
/**
* 根据编码查询
*
* @param code code
* @return Stage
*/
StageDto findByCode(String code);
/**
* 设备编号和组价id获取设备信息
* @param jsonArray
* @return
*/
JSONArray getDeviceByCodes(JSONArray jsonArray) throws Exception;
}

15
acs/hd/nladmin-system/src/main/java/org/nl/acs/stage/service/dto/StageDto.java → acs/hd/nladmin-system/src/main/java/org/nl/logicflow/service/dto/StageDto.java
View File

@@ -1,17 +1,16 @@
package org.nl.acs.stage.service.dto;
package org.nl.logicflow.service.dto;
import lombok.Data;
import java.io.Serializable;
/**
* @author ldjun
* @description /
* @date 2021-04-12
**/
* @Author: lyd
* @Description: 舞台数据的Dto
* @Date: 2022-08-15
*/
@Data
public class StageDto implements Serializable {
/**
* 舞台标识
*/
@@ -28,9 +27,9 @@ public class StageDto implements Serializable {
private String stage_name;
/**
* 备注
* 舞台数据
*/
private String remark;
private String stage_data;
/**
* 是否启用

12
acs/hd/nladmin-system/src/main/java/org/nl/acs/stage/service/dto/StageImageDto.java → acs/hd/nladmin-system/src/main/java/org/nl/logicflow/service/dto/StageImageDto.java
View File

@@ -1,17 +1,16 @@
package org.nl.acs.stage.service.dto;
package org.nl.logicflow.service.dto;
import lombok.Data;
import java.io.Serializable;
/**
* @author zhouz
* @description /
* @date 2021-04-06
**/
* @Author: lyd
* @Description: 设备图标dto
* @Date: 2022-08-16
*/
@Data
public class StageImageDto implements Serializable {
/**
* 设备标识
*/
@@ -67,3 +66,4 @@ public class StageImageDto implements Serializable {
*/
private String image_code;
}

96
acs/hd/nladmin-system/src/main/java/org/nl/acs/stage/service/impl/StageImageServiceImpl.java → acs/hd/nladmin-system/src/main/java/org/nl/logicflow/service/impl/StageImageServiceImpl.java
View File

@@ -1,6 +1,4 @@
package org.nl.acs.stage.service.impl;
package org.nl.logicflow.service.impl;
import cn.hutool.core.date.DateUtil;
import cn.hutool.core.util.IdUtil;
@@ -8,10 +6,9 @@ import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.nl.acs.stage.service.StageImageService;
import org.nl.acs.stage.service.dto.StageImageDto;
import org.nl.exception.BadRequestException;
import org.nl.utils.FileUtil;
import org.nl.logicflow.service.StageImageService;
import org.nl.logicflow.service.dto.StageImageDto;
import org.nl.utils.SecurityUtils;
import org.nl.wql.core.bean.ResultBean;
import org.nl.wql.core.bean.WQLObject;
@@ -20,59 +17,29 @@ import org.springframework.data.domain.Pageable;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import javax.servlet.http.HttpServletResponse;
import java.io.IOException;
import java.util.ArrayList;
import java.util.LinkedHashMap;
import java.util.List;
import java.util.Map;
/**
* @author zhouz
* @description 服务实现
* @date 2021-04-06
**/
* @Author: lyd
* @Description: 舞台图标的服务实现
* @Date: 2022-08-16
*/
@Service
@RequiredArgsConstructor
@Slf4j
public class StageImageServiceImpl implements StageImageService {
@Override
public Map<String, Object> queryAll(Map whereJson, Pageable page) {
String where = "1=1";
if (whereJson.get("device_type") != null) {
where = "driver_code_json like ('%" + whereJson.get("device_type") + "%')";
}
WQLObject wo = WQLObject.getWQLObject("acs_stage_image");
WQLObject wo = WQLObject.getWQLObject("stage_image");
ResultBean rb = wo.pagequery(WqlUtil.getHttpContext(page), where, "update_time desc");
final JSONObject json = rb.pageResult();
return json;
}
@Override
public List<StageImageDto> queryAll(Map whereJson) {
WQLObject wo = WQLObject.getWQLObject("acs_stage_image");
JSONArray arr = wo.query().getResultJSONArray(0);
List<StageImageDto> list = arr.toJavaList(StageImageDto.class);
return list;
}
@Override
public StageImageDto findById(String image_uuid) {
WQLObject wo = WQLObject.getWQLObject("acs_stage_image");
JSONObject json = wo.query("image_uuid ='" + image_uuid + "'").uniqueResult(0);
final StageImageDto obj = json.toJavaObject(StageImageDto.class);
return obj;
}
@Override
public StageImageDto findByCode(String code) {
WQLObject wo = WQLObject.getWQLObject("acs_stage_image");
JSONObject json = wo.query("code ='" + code + "'").uniqueResult(0);
final StageImageDto obj = json.toJavaObject(StageImageDto.class);
return obj;
}
@Override
@Transactional(rollbackFor = Exception.class)
public void create(StageImageDto dto) {
@@ -85,8 +52,8 @@ public class StageImageServiceImpl implements StageImageService {
dto.setUpdate_time(now);
dto.setCreate_time(now);
WQLObject wo = WQLObject.getWQLObject("acs_stage_image");
JSONObject json = (JSONObject) JSONObject.toJSON(dto);
WQLObject wo = WQLObject.getWQLObject("stage_image");
JSONObject json = (JSONObject) JSONObject.toJSON(dto);
wo.insert(json);
}
@@ -102,38 +69,43 @@ public class StageImageServiceImpl implements StageImageService {
dto.setUpdate_time(now);
dto.setUpdate_by(currentUsername);
WQLObject wo = WQLObject.getWQLObject("acs_stage_image");
JSONObject json = (JSONObject) JSONObject.toJSON(dto);
WQLObject wo = WQLObject.getWQLObject("stage_image");
JSONObject json = (JSONObject) JSONObject.toJSON(dto);
wo.update(json);
}
@Override
public StageImageDto findById(String image_uuid) {
WQLObject wo = WQLObject.getWQLObject("stage_image");
JSONObject json = wo.query("image_uuid ='" + image_uuid + "'").uniqueResult(0);
final StageImageDto obj = json.toJavaObject(StageImageDto.class);
return obj;
}
@Override
@Transactional(rollbackFor = Exception.class)
public void deleteAll(String[] ids) {
WQLObject wo = WQLObject.getWQLObject("acs_stage_image");
WQLObject wo = WQLObject.getWQLObject("stage_image");
for (String image_uuid : ids) {
wo.delete("image_uuid = '" + image_uuid + "'");
}
}
@Override
public void download(List<StageImageDto> all, HttpServletResponse response) throws IOException {
List<Map<String, Object>> list = new ArrayList<>();
for (StageImageDto stageImage : all) {
Map<String, Object> map = new LinkedHashMap<>();
map.put("设备名字", stageImage.getImage_name());
map.put("适用驱动", stageImage.getDriver_code_json());
map.put("备注", stageImage.getRemark());
map.put("是否启用", stageImage.getIs_active());
map.put("是否删除", stageImage.getIs_delete());
map.put("创建者", stageImage.getCreate_by());
map.put("创建时间", stageImage.getCreate_time());
map.put("修改者", stageImage.getUpdate_by());
map.put("修改时间", stageImage.getUpdate_time());
map.put("图标编码", stageImage.getImage_code());
list.add(map);
public JSONArray selectList() {
//设备基础信息表【acs_stage_image】
JSONArray arr = WQLObject.getWQLObject("stage_image").query("is_delete= '0' AND is_active= '1'", "update_time desc").getResultJSONArray(0);
JSONArray result = new JSONArray();
for (int i = 0; i < arr.size(); i++) {
JSONObject obj = arr.getJSONObject(i);
JSONObject json = new JSONObject();
json.put("image_uuid", obj.getString("image_uuid"));
json.put("image_code", obj.getString("image_code"));
json.put("image_name", obj.getString("image_code").toString().split("-")[0]);
result.add(json);
}
FileUtil.downloadExcel(list, response);
return result;
}
}

300
acs/hd/nladmin-system/src/main/java/org/nl/acs/stage/service/impl/StageActorServiceImpl.java → acs/hd/nladmin-system/src/main/java/org/nl/logicflow/service/impl/StageServiceImpl.java
View File

@@ -1,13 +1,9 @@
package org.nl.acs.stage.service.impl;
package org.nl.logicflow.service.impl;
import cn.hutool.core.date.DateUtil;
import cn.hutool.core.map.MapUtil;
import cn.hutool.core.util.IdUtil;
import cn.hutool.core.util.ObjectUtil;
import cn.hutool.core.util.StrUtil;
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import lombok.RequiredArgsConstructor;
@@ -37,11 +33,9 @@ import org.nl.acs.device_driver.standard_scanner.StandardScannerDeviceDriver;
import org.nl.acs.opc.Device;
import org.nl.acs.opc.DeviceAppService;
import org.nl.acs.opc.DeviceAppServiceImpl;
import org.nl.acs.stage.service.StageActorService;
import org.nl.acs.stage.service.dto.StageActorDto;
import org.nl.exception.BadRequestException;
import org.nl.utils.FileUtil;
import org.nl.utils.RedisUtils;
import org.nl.logicflow.service.StageService;
import org.nl.logicflow.service.dto.StageDto;
import org.nl.utils.SecurityUtils;
import org.nl.utils.SpringContextHolder;
import org.nl.wql.core.bean.ResultBean;
@@ -51,70 +45,38 @@ import org.springframework.data.domain.Pageable;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import javax.servlet.http.HttpServletResponse;
import java.io.IOException;
import java.net.BindException;
import java.util.ArrayList;
import java.util.LinkedHashMap;
import java.util.List;
import java.util.Map;
/**
* @author ldjun
* @description 服务实现
* @date 2021-04-12
**/
* @Author: lyd
* @Description: 舞台编辑实现类
* @Date: 2022-08-15
*/
@Service
@RequiredArgsConstructor
@Slf4j
public class StageActorServiceImpl implements StageActorService {
private final RedisUtils redisUtils;
public class StageServiceImpl implements StageService {
@Override
public Map<String, Object> queryAll(Map whereJson, Pageable page) {
WQLObject wo = WQLObject.getWQLObject("acs_stage_actor");
WQLObject wo = WQLObject.getWQLObject("stage");
ResultBean rb = wo.pagequery(WqlUtil.getHttpContext(page), "", "update_time desc");
final JSONObject json = rb.pageResult();
return json;
}
@Override
public List<StageActorDto> queryAll(Map whereJson) {
WQLObject wo = WQLObject.getWQLObject("acs_stage_actor");
JSONArray arr = wo.query().getResultJSONArray(0);
List<StageActorDto> list = arr.toJavaList(StageActorDto.class);
return list;
}
@Override
public StageActorDto findById(String actor_uuid) {
WQLObject wo = WQLObject.getWQLObject("acs_stage_actor");
JSONObject json = wo.query("actor_uuid ='" + actor_uuid + "'").uniqueResult(0);
final StageActorDto obj = json.toJavaObject(StageActorDto.class);
return obj;
}
@Override
public StageActorDto findByCode(String code) {
WQLObject wo = WQLObject.getWQLObject("acs_stage_actor");
JSONObject json = wo.query("code ='" + code + "'").uniqueResult(0);
final StageActorDto obj = json.toJavaObject(StageActorDto.class);
return obj;
}
@Override
@Transactional(rollbackFor = Exception.class)
public void create(StageActorDto dto) {
public void create(StageDto dto) {
String currentUsername = SecurityUtils.getCurrentUsername();
String now = DateUtil.now();
dto.setActor_uuid(IdUtil.simpleUUID());
dto.setStage_uuid(IdUtil.simpleUUID());
dto.setCreate_by(currentUsername);
dto.setUpdate_by(currentUsername);
dto.setUpdate_time(now);
dto.setCreate_time(now);
WQLObject wo = WQLObject.getWQLObject("acs_stage_actor");
WQLObject wo = WQLObject.getWQLObject("stage");
JSONObject json = (JSONObject) JSONObject.toJSON(dto);
wo.insert(json);
@@ -122,8 +84,8 @@ public class StageActorServiceImpl implements StageActorService {
@Override
@Transactional(rollbackFor = Exception.class)
public void update(StageActorDto dto) {
StageActorDto entity = this.findById(dto.getActor_uuid());
public void update(StageDto dto) {
StageDto entity = this.findById(dto.getStage_uuid());
if (entity == null) throw new BadRequestException("被删除或无权限，操作失败!");
String currentUsername = SecurityUtils.getCurrentUsername();
@@ -131,165 +93,111 @@ public class StageActorServiceImpl implements StageActorService {
dto.setUpdate_time(now);
dto.setUpdate_by(currentUsername);
WQLObject wo = WQLObject.getWQLObject("acs_stage_actor");
WQLObject wo = WQLObject.getWQLObject("stage");
JSONObject json = (JSONObject) JSONObject.toJSON(dto);
wo.update(json);
}
@Override
public StageDto findById(String stage_uuid) {
WQLObject wo = WQLObject.getWQLObject("stage");
JSONObject json = wo.query("stage_uuid ='" + stage_uuid + "'").uniqueResult(0);
final StageDto obj = json.toJavaObject(StageDto.class);
return obj;
}
@Override
@Transactional(rollbackFor = Exception.class)
public void deleteAll(String[] ids) {
WQLObject wo = WQLObject.getWQLObject("acs_stage_actor");
for (String actor_uuid : ids) {
wo.delete("actor_uuid = '" + actor_uuid + "'");
WQLObject wo = WQLObject.getWQLObject("stage");
for (String stage_uuid : ids) {
wo.delete("stage_uuid = '" + stage_uuid + "'");
}
}
@Override
public void download(List<StageActorDto> all, HttpServletResponse response) throws IOException {
List<Map<String, Object>> list = new ArrayList<>();
for (StageActorDto stageActor : all) {
Map<String, Object> map = new LinkedHashMap<>();
map.put("设备编码", stageActor.getDevice_code());
map.put("图标名字", stageActor.getDevice_name());
map.put("图标名字", stageActor.getImage_name());
map.put("图标名字", stageActor.getAngle());
map.put("舞台标识", stageActor.getStage_uuid());
map.put("备注", stageActor.getRemark());
map.put("是否启用", stageActor.getIs_active());
map.put("是否删除", stageActor.getIs_delete());
map.put("创建者", stageActor.getCreate_by());
map.put("创建时间", stageActor.getCreate_time());
map.put("修改者", stageActor.getUpdate_by());
map.put("修改时间", stageActor.getUpdate_time());
list.add(map);
public JSONArray selectList() {
//设备基础信息表【stage】
JSONArray arr = WQLObject.getWQLObject("stage").query("is_delete= '0' AND is_active= '1'").getResultJSONArray(0);
JSONArray result = new JSONArray();
for (int i = 0; i < arr.size(); i++) {
JSONObject obj = arr.getJSONObject(i);
JSONObject json = new JSONObject();
json.put("stage_id", obj.getString("stage_id"));
json.put("stage_code", obj.getString("stage_code"));
json.put("stage_name", obj.getString("stage_name"));
result.add(json);
}
FileUtil.downloadExcel(list, response);
return result;
}
@Override
public void saveData(JSONObject mstForm, JSONArray array) throws IOException {
String stage_code = mstForm.getString("stage_code");
String grid_width = mstForm.getString("grid_width");
String grid_length = mstForm.getString("grid_length");
//舞台主表【acs_stage】
WQLObject stageTab = WQLObject.getWQLObject("acs_stage");
JSONObject stageObj = stageTab.query("is_delete ='0' and stage_code = '" + stage_code + "'").uniqueResult(0);
if (ObjectUtil.isNull(stageObj)) {
throw new BindException("舞台为找到，操作失败!");
}
stageObj.put("grid_width", grid_width);
stageObj.put("grid_length", grid_length);
stageTab.update(stageObj);
//舞台实时监控表【acs_stage_actor】
WQLObject actorTab = WQLObject.getWQLObject("acs_stage_actor");
String stage_uuid = stageObj.getString("stage_uuid");
actorTab.delete("stage_uuid = '" + stage_uuid + "'");
JSONArray actors = new JSONArray();
for (int i = 0; i < array.size(); i++) {
JSONObject json = array.getJSONObject(i);
JSONObject param = new JSONObject();
param.put("actor_uuid", IdUtil.simpleUUID());
param.put("device_code", json.getString("device_code"));
param.put("device_name", json.getString("name"));
param.put("image_name", json.getString("img2"));
param.put("index_seq", json.getString("index"));
param.put("angle", json.getString("angle"));
param.put("stage_uuid", stage_uuid);
actors.add(param);
String currentUsername = SecurityUtils.getCurrentUsername();
String now = DateUtil.now();
param.put("create_by", currentUsername);
param.put("create_time", now);
param.put("update_by", currentUsername);
param.put("update_time", now);
actorTab.insert(param);
}
redisUtils.del("stage:mst:" + stage_code);
redisUtils.del("stage:dtl:" + stage_code);
redisUtils.set("stage:mst:" + stage_code, stageObj.toString());
redisUtils.set("stage:dtl:" + stage_code, actors.toString());
public void addNewStage(StageDto dto) {
// 根据dto的code找到数据
StageDto stageDto = this.findByCode(dto.getStage_code());
// 设置内容
stageDto.setStage_data(dto.getStage_data());
// 获取当前用户与时间
String currentUsername = SecurityUtils.getCurrentUsername();
String now = DateUtil.now();
stageDto.setUpdate_time(now);
stageDto.setUpdate_by(currentUsername);
WQLObject wo = WQLObject.getWQLObject("stage");
JSONObject json = (JSONObject) JSONObject.toJSON(stageDto);
wo.update(json);
}
@Override
public JSONObject queryStageActorByStageCode(String stage_code) throws Exception {
//舞台主表【acs_stage】
WQLObject stageTab = WQLObject.getWQLObject("acs_stage");
public StageDto findByCode(String code) {
WQLObject wo = WQLObject.getWQLObject("stage");
JSONObject json = wo.query("stage_code ='" + code + "'").uniqueResult(0);
final StageDto obj = json.toJavaObject(StageDto.class);
return obj;
}
JSONObject stageObj;
//先从缓存查找
stageObj = JSON.parseObject(redisUtils.get("stage:mst:" + stage_code).toString());
//缓存没找到去数据库查找
if (MapUtil.isEmpty(stageObj)) {
stageObj = stageTab.query("is_delete ='0' and stage_code = '" + stage_code + "'").uniqueResult(0);
}
if (MapUtil.isEmpty(stageObj)) {
throw new BindException("舞台为找到，操作失败!");
}
//舞台实时监控表【acs_stage_actor】
WQLObject actorTab = WQLObject.getWQLObject("acs_stage_actor");
String stage_uuid = stageObj.getString("stage_uuid");
JSONArray arr = new JSONArray();
JSONArray list = new JSONArray();
String dtl = (String) redisUtils.get("stage:dtl:" + stage_code);
if (StrUtil.isNotEmpty(dtl)) {
list = JSONArray.parseArray(dtl);
}
if (ObjectUtil.isNull(list) || list.size() < 1) {
list = actorTab.query("stage_uuid = '" + stage_uuid + "'", "index_seq").getResultJSONArray(0);
}
@Override
public JSONArray getDeviceByCodes(JSONArray jsonArray) throws Exception { // 前端传来设备编号和节点的id
DeviceAppService appService = SpringContextHolder.getBean(DeviceAppServiceImpl.class);
for (int i = 0, j = list.size(); i < j; i++) {
JSONObject json = list.getJSONObject(i);
JSONArray arr = new JSONArray();
for (int i=0; i<jsonArray.size(); i++) {
JSONObject obj = new JSONObject();
obj.put("id", json.getInteger("index"));
obj.put("index", json.getInteger("index_seq"));
obj.put("device_code", json.getString("device_code"));
String device_code = json.getString("device_code");
if (!StrUtil.isEmpty(device_code)) {
//作业状态
String mode = "";
//信号
String move = "";
//取放信号
String action = "";
//进出信号
String io_action = "";
//报警
String error = "";
//设备状态
String status = "";
//托盘数量
String number = "";
//异常或说明信息
String message = "";
//当前指令
String instruction = "";
//上次指令
String last_instruction = "";
//当前托盘号
String pallet = "";
//当前托盘号
String last_pallet = "";
boolean applySucess;
boolean requestSucess;
if (!StrUtil.isEmpty(json.getString("device_code")) || json.getString("device_code").length() > 0) {
JSONObject jo = new JSONObject();
Device device = appService.findDeviceByCode(device_code);
if (ObjectUtil.isNull(device)) {
continue;
}
JSONObject js = jsonArray.getJSONObject(i);
//作业状态
String mode = "";
//信号
String move = "";
//取放信号
String action = "";
//进出信号
String io_action = "";
//报警
String error = "";
//设备状态
String status = "";
//托盘数量
String number = "";
//异常或说明信息
String message = "";
//当前指令
String instruction = "";
//上次指令
String last_instruction = "";
//当前托盘号
String pallet = "";
//当前托盘号
String last_pallet = "";
boolean applySucess;
boolean requestSucess;
if (ObjectUtil.isNotEmpty(js.get("device_code"))) { // 查找有绑定了设备号的设备
JSONObject jo = new JSONObject();
Device device = appService.findDeviceByCode((String) js.get("device_code"));
if (!ObjectUtil.isNull(device)) {
// if (ObjectUtil.isNotEmpty(device.getDeviceDriver())) {
// IDriverService driverService = applicationContext.getBean(device.getDeviceDriverDefination().getDriverCode(), IDriverService.class);
// obj.put("device_name", device.getDevice_name());
// jo = driverService.getDeviceInfo(device);
// }
//无光电普通站点
StandardOrdinarySiteDeviceDriver standardOrdinarySiteDeviceDriver;
//无光电特殊站点
@@ -312,6 +220,7 @@ public class StageActorServiceImpl implements StageActorService {
StandardAutodoorDeviceDriver standardAutodoorDeviceDriver;
//中刚洛耐RGV
StandardRGVDeviceDriver standardRGVDeviceDriver;
//电子围栏viceDriver electricFenceDeviceDriver;
//嘉耐-码垛机械手
LnshPalletizingManipulatorDeviceDriver lnshPalletizingManipulatorDeviceDriver;
//嘉耐-窑车道
@@ -1211,18 +1120,13 @@ public class StageActorServiceImpl implements StageActorService {
jo.put("qty", lnshOneRGVDeviceDriver.getQty());
}
obj.put("data", jo);
obj.put("device_code", js.get("device_code"));
}
}
obj.put("img2", json.getString("image_name"));
obj.put("angle", json.getString("angle"));
obj.put("id", js.get("id")); // 设备不存在就只保留id，方便前端查看
arr.add(obj);
}
JSONObject result = new JSONObject();
result.put("form", stageObj);
result.put("detail", arr);
return result;
return arr;
}
}

2
acs/hd/nladmin-system/src/main/java/org/nl/modules/loki/service/impl/LokiServiceImpl.java
View File

@@ -60,7 +60,7 @@ public class LokiServiceImpl implements LokiService {
JSONObject parse = null;
String query = lokiUrl + "/query_range?query={" + logLabel + "=\"" + logLabelValue + "\"} |= `" + text + "`";
String result = "";
if (start.equals(0L)) {
if (start==0L) {
result = HttpUtil.get(query + "&limit=" + limit + "&direction=" + direction, CharsetUtil.CHARSET_UTF_8);
} else {
result = HttpUtil.get(query + "&limit=" + limit + "&start=" + start + "&end=" + end + "&direction=" + direction, CharsetUtil.CHARSET_UTF_8);

36
acs/hd/nladmin-system/src/main/java/org/nl/modules/quartz/task/DeviceStatusMonitor.java
View File

@@ -4,7 +4,7 @@ import cn.hutool.core.util.StrUtil;
import com.alibaba.fastjson.JSONObject;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.nl.acs.stage.service.StageActorService;
//import org.nl.acs.stage.service.StageActorService;
import org.nl.modules.mnt.websocket.MsgType;
import org.nl.modules.mnt.websocket.SocketMsg;
import org.nl.modules.mnt.websocket.WebSocketServer;
@@ -20,21 +20,21 @@ import java.io.IOException;
@Component
@RequiredArgsConstructor
public class DeviceStatusMonitor {
@Autowired
StageActorService stageActorService;
private String stage_code = "SHDP";
public void run(String stageCode) throws Exception {
try {
if (StrUtil.isNotEmpty(stageCode)) {
stage_code = stageCode;
}
JSONObject json = stageActorService.queryStageActorByStageCode(stage_code);
SocketMsg deviceInfo = new SocketMsg(json, MsgType.INFO);
WebSocketServer.sendInfo(deviceInfo, "device_monitor");
} catch (IOException e) {
e.printStackTrace();
}
}
// @Autowired
// StageActorService stageActorService;
// private String stage_code = "SHDP";
//
// public void run(String stageCode) throws Exception {
// try {
// if (StrUtil.isNotEmpty(stageCode)) {
// stage_code = stageCode;
// }
// JSONObject json = stageActorService.queryStageActorByStageCode(stage_code);
// SocketMsg deviceInfo = new SocketMsg(json, MsgType.INFO);
//
// WebSocketServer.sendInfo(deviceInfo, "device_monitor");
// } catch (IOException e) {
// e.printStackTrace();
// }
// }
}

BIN
acs/hd/nladmin-system/src/main/java/org/nl/modules/system/wql/sys.xls
View File

Binary file not shown.

56
acs/hd/nladmin-system/src/main/resources/log/WmsToAcs.xml
View File

@@ -1,30 +1,30 @@
<?xml version="1.0" encoding="UTF-8"?>
<included>
<springProperty scope="context" name="logPath" source="logging.file.path" defaultValue="logs"/>
<springProperty scope="context" name="lokiUrl" source="loki.url"/>
<property name="LOKI_URL" value="${lokiUrl}"/>
<property name="log.pattern"
value="%black(%contextName-) %red(%d{yyyy-MM-dd HH:mm:ss}) %green([%thread]) %highlight(%-5level) %boldMagenta(%logger{36}) - %gray(%msg%n)"/>
<!--<?xml version="1.0" encoding="UTF-8"?>-->
<!--<included>-->
<!-- <springProperty scope="context" name="logPath" source="logging.file.path" defaultValue="logs"/>-->
<!-- <springProperty scope="context" name="lokiUrl" source="loki.url"/>-->
<!-- <property name="LOKI_URL" value="${lokiUrl}"/>-->
<!-- <property name="log.pattern"-->
<!-- value="%black(%contextName-) %red(%d{yyyy-MM-dd HH:mm:ss}) %green([%thread]) %highlight(%-5level) %boldMagenta(%logger{36}) - %gray(%msg%n)"/>-->
<!--添加loki-->
<appender name="lokiAppender" class="com.github.loki4j.logback.Loki4jAppender">
<batchTimeoutMs>1000</batchTimeoutMs>
<http class="com.github.loki4j.logback.ApacheHttpSender">
<url>${LOKI_URL}</url>
</http>
<format>
<label>
<pattern>logType=wms_to_acs</pattern>
</label>
<message>
<pattern>${log.pattern}</pattern>
</message>
<sortByTime>true</sortByTime>
</format>
</appender>
<!-- &lt;!&ndash;添加loki&ndash;&gt;-->
<!-- <appender name="lokiAppender" class="com.github.loki4j.logback.Loki4jAppender">-->
<!-- <batchTimeoutMs>1000</batchTimeoutMs>-->
<!-- <http class="com.github.loki4j.logback.ApacheHttpSender">-->
<!-- <url>${LOKI_URL}</url>-->
<!-- </http>-->
<!-- <format>-->
<!-- <label>-->
<!-- <pattern>logType=wms_to_acs</pattern>-->
<!-- </label>-->
<!-- <message>-->
<!-- <pattern>${log.pattern}</pattern>-->
<!-- </message>-->
<!-- <sortByTime>true</sortByTime>-->
<!-- </format>-->
<!-- </appender>-->
<!-- 打印sql -->
<logger name="org.nl.acs.ext.wms.service.impl.WmsToAcsServiceImpl" level="info" additivity="false">
<appender-ref ref="lokiAppender" />
</logger>
</included>
<!-- &lt;!&ndash; 打印sql &ndash;&gt;-->
<!-- <logger name="org.nl.acs.ext.wms.service.impl.WmsToAcsServiceImpl" level="info" additivity="false">-->
<!-- <appender-ref ref="lokiAppender" />-->
<!-- </logger>-->
<!--</included>-->

2
acs/hd/nladmin-system/src/main/resources/logback-spring.xml
View File

@@ -25,7 +25,7 @@ https://juejin.cn/post/6844903775631572999
<include resource="log/AgvLeaveServlet.xml"/>
<include resource="log/AcsToErp.xml"/>
<include resource="log/AcsToWms.xml"/>
<include resource="log/WmsToAcs.xml"/>
<!-- <include resource="log/WmsToAcs.xml"/>-->
<include resource="log/QueryXZAgvTaskStatus.xml"/>
<include resource="log/NDCSocketConnectionAutoRun.xml"/>-->
<!-- <include resource="log/QueryMagicAgvDeviceStatus.xml"/>-->